diff --git a/app/index.html b/app/index.html
index f649c8d..0e03be1 100644
--- a/app/index.html
+++ b/app/index.html
@@ -24,25 +24,12 @@
             <img class="control_img" src="./static/point_charge.png" alt="点">
           </button>
         </div>
-        <!-- <div class="control_button">
-          <p class="title">有限線</p>
-          <button type="button" id="add_finite_line_charge_button">
-            <img class="control_img" src="./static/finite_line_charge.png" alt="有限線">
-          </button>
-        </div> -->
         <div class="control_button">
           <p class="title">無限線</p>
           <button type="button" id="add_infinity_line_charge_button">
             <img class="control_img" src="./static/infinity_line_charge.png" alt="無限線">
           </button>
         </div>
-        <!-- <div class="control_button">
-          <p class="title">有限面</p>
-          <button type="button" id="add_finite_surface_charge_button">
-            <img class="control_img" src="./static/finite_surface_charge.png" alt="有限面">
-          </button>
-        </div> -->
-
         <div class="control_button">
           <p class="title">無限柱表面</p>
           <button type="button" id="add_infinity_cylinder_surface_charge_button">
diff --git a/app/script/infinityCylinderSurfaceCharge.ts b/app/script/infinityCylinderSurfaceCharge.ts
index bb8e1ef..ac7b9ba 100644
--- a/app/script/infinityCylinderSurfaceCharge.ts
+++ b/app/script/infinityCylinderSurfaceCharge.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { Charge, ChargeToChargeType } from './charge';
+import { Charge, ChargeType, ChargeToChargeType } from './charge';
 import { permittivity } from './constants';
 import { Editor, PositionEditor, NumberEditor, RotationEditor } from './editor';
 import { Store } from './store';
@@ -39,7 +39,7 @@ export class InfinityCylinderSurfaceCharge extends Charge {
      * 電荷の正負を取得する
      * @returns 電荷の正負
      */
-    override getChargeType = () => {
+    override getChargeType = (): ChargeType => {
 
         return ChargeToChargeType(this.surfaceDensity);
 
@@ -51,7 +51,7 @@ export class InfinityCylinderSurfaceCharge extends Charge {
      * @param position 任意の座標
      * @returns 電荷との距離ベクトル
      */
-    private distanceFrom = (position: THREE.Vector3) => {
+    private distanceFrom = (position: THREE.Vector3): THREE.Vector3 => {
 
         // 計算を行いやすいよう、線電荷がx=z=0に位置するように観測点の座標を変換する
         const positionTransformed = position.clone().sub(this.position);              // 線電荷の中心を原点に移動
@@ -69,7 +69,7 @@ export class InfinityCylinderSurfaceCharge extends Charge {
      * @param threshold 閾値
      * @returns 接触しているかどうか
      */
-    override isContact = (position: THREE.Vector3, threshold: number) => {
+    override isContact = (position: THREE.Vector3, threshold: number): boolean => {
 
         const lengthSq = this.distanceFrom(position).lengthSq();
 
@@ -90,7 +90,7 @@ export class InfinityCylinderSurfaceCharge extends Charge {
      * @param position 任意の座標
      * @returns 電界ベクトル
      */
-    override electricFieldVector = (position: THREE.Vector3) => {
+    override electricFieldVector = (position: THREE.Vector3): THREE.Vector3 => {
 
         const distance = this.distanceFrom(position);
 
@@ -116,7 +116,7 @@ export class InfinityCylinderSurfaceCharge extends Charge {
      * 電気力線の始点、方向ベクトルの配列を返す
      * @returns 電気力線の始点、方向ベクトルの配列
      */
-    override electricForceLinesDirection = () => {
+    override electricForceLinesDirection = (): { begin: THREE.Vector3, direction: THREE.Vector3 }[] => {
 
         const heightCount = 6;
         const thetaCount = 10;
@@ -162,7 +162,7 @@ export class InfinityCylinderSurfaceCharge extends Charge {
     /**
      * JSONから電荷を生成する
      */
-    static override fromJSON = (json: any) => {
+    static override fromJSON = (json: any): Charge => {
 
         return new InfinityCylinderSurfaceCharge(
             new THREE.Vector3(json.position.x, json.position.y, json.position.z),
@@ -200,7 +200,7 @@ export class InfinityCylinderSurfaceCharge extends Charge {
     /**
      * パラメーター設定用エディタを生成する
      */
-    override createEditor = () => {
+    override createEditor = (): Editor => {
 
         const positionEditor = new PositionEditor({
             position: this.position,
diff --git a/app/script/infinityCylinderVolumeCharge.ts b/app/script/infinityCylinderVolumeCharge.ts
index 8e5ed6f..7799fde 100644
--- a/app/script/infinityCylinderVolumeCharge.ts
+++ b/app/script/infinityCylinderVolumeCharge.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { Charge, ChargeToChargeType } from './charge';
+import { Charge, ChargeType, ChargeToChargeType } from './charge';
 import { permittivity } from './constants';
 import { Editor, PositionEditor, NumberEditor, RotationEditor } from './editor';
 import { Store } from './store';
@@ -40,7 +40,7 @@ export class InfinityCylinderVolumeCharge extends Charge {
      * 電荷の正負を取得する
      * @returns 電荷の正負
      */
-    override getChargeType = () => {
+    override getChargeType = (): ChargeType => {
 
         return ChargeToChargeType(this.volumeDensity);
 
@@ -52,7 +52,7 @@ export class InfinityCylinderVolumeCharge extends Charge {
      * @param position 任意の座標
      * @returns 電荷との距離ベクトル
      */
-    private distanceFrom = (position: THREE.Vector3) => {
+    private distanceFrom = (position: THREE.Vector3): THREE.Vector3 => {
 
         // 計算を行いやすいよう、線電荷がx=z=0に位置するように観測点の座標を変換する
         const positionTransformed = position.clone().sub(this.position);              // 線電荷の中心を原点に移動
@@ -70,7 +70,7 @@ export class InfinityCylinderVolumeCharge extends Charge {
      * @param threshold 閾値
      * @returns 接触しているかどうか
      */
-    override isContact = (position: THREE.Vector3, threshold: number) => {
+    override isContact = (position: THREE.Vector3, threshold: number): boolean => {
 
         return this.distanceFrom(position).lengthSq() < threshold ** 2;
 
@@ -82,7 +82,7 @@ export class InfinityCylinderVolumeCharge extends Charge {
      * @param position 任意の座標
      * @returns 電界ベクトル
      */
-    override electricFieldVector = (position: THREE.Vector3) => {
+    override electricFieldVector = (position: THREE.Vector3): THREE.Vector3 => {
 
         const distance = this.distanceFrom(position);
 
@@ -108,7 +108,7 @@ export class InfinityCylinderVolumeCharge extends Charge {
      * 電気力線の始点、方向ベクトルの配列を返す
      * @returns 電気力線の始点、方向ベクトルの配列
      */
-    override electricForceLinesDirection = () => {
+    override electricForceLinesDirection = (): { begin: THREE.Vector3, direction: THREE.Vector3 }[] => {
 
         const heightCount = 6;
         const thetaCount = 10;
@@ -154,7 +154,7 @@ export class InfinityCylinderVolumeCharge extends Charge {
     /**
      * JSONから電荷を生成する
      */
-    static override fromJSON = (json: any) => {
+    static override fromJSON = (json: any): Charge => {
 
         return new InfinityCylinderVolumeCharge(
             new THREE.Vector3(json.position.x, json.position.y, json.position.z),
@@ -191,7 +191,7 @@ export class InfinityCylinderVolumeCharge extends Charge {
     /**
      * パラメーター設定用エディタを生成する
      */
-    override createEditor = () => {
+    override createEditor = (): Editor => {
 
         const positionEditor = new PositionEditor({
             position: this.position,
diff --git a/app/script/infinityLineCharge.ts b/app/script/infinityLineCharge.ts
index ac6ffa5..5339c9b 100644
--- a/app/script/infinityLineCharge.ts
+++ b/app/script/infinityLineCharge.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { Charge, ChargeToChargeType } from './charge';
+import { Charge, ChargeType, ChargeToChargeType } from './charge';
 import { permittivity } from './constants';
 import { Editor, PositionEditor, NumberEditor, RotationEditor } from './editor';
 import { Store } from './store';
@@ -38,7 +38,7 @@ export class InfinityLineCharge extends Charge {
      * 電荷の正負を取得する
      * @returns 電荷の正負
      */
-    override getChargeType = () => {
+    override getChargeType = (): ChargeType => {
 
         return ChargeToChargeType(this.lineDensity);
 
@@ -50,7 +50,7 @@ export class InfinityLineCharge extends Charge {
      * @param position 任意の座標
      * @returns 電荷との距離ベクトル
      */
-    private distanceFrom = (position: THREE.Vector3) => {
+    private distanceFrom = (position: THREE.Vector3): THREE.Vector3 => {
 
         // 計算を行いやすいよう、線電荷がx=z=0に位置するように観測点の座標を変換する
         const positionTransformed = position.clone().sub(this.position);              // 線電荷の中心を原点に移動
@@ -68,7 +68,7 @@ export class InfinityLineCharge extends Charge {
      * @param threshold 閾値
      * @returns 接触しているかどうか
      */
-    override isContact = (position: THREE.Vector3, threshold: number) => {
+    override isContact = (position: THREE.Vector3, threshold: number): boolean => {
 
         return this.distanceFrom(position).lengthSq() < threshold ** 2;
 
@@ -80,7 +80,7 @@ export class InfinityLineCharge extends Charge {
      * @param position 任意の座標
      * @returns 電界ベクトル
      */
-    override electricFieldVector = (position: THREE.Vector3) => {
+    override electricFieldVector = (position: THREE.Vector3): THREE.Vector3 => {
 
         const distance = this.distanceFrom(position);
 
@@ -97,7 +97,7 @@ export class InfinityLineCharge extends Charge {
      * 電気力線の始点、方向ベクトルの配列を返す
      * @returns 電気力線の始点、方向ベクトルの配列
      */
-    override electricForceLinesDirection = () => {
+    override electricForceLinesDirection = (): { begin: THREE.Vector3, direction: THREE.Vector3 }[] => {
 
         const heightCount = 6;
         const thetaCount = 10;
@@ -142,7 +142,7 @@ export class InfinityLineCharge extends Charge {
     /**
      * JSONから電荷を生成する
      */
-    static override fromJSON = (json: any) => {
+    static override fromJSON = (json: any): Charge => {
 
         return new InfinityLineCharge(
             new THREE.Vector3(json.position.x, json.position.y, json.position.z),
@@ -178,7 +178,7 @@ export class InfinityLineCharge extends Charge {
     /**
      * パラメーター設定用エディタを生成する
      */
-    override createEditor = () => {
+    override createEditor = (): Editor => {
 
         const positionEditor = new PositionEditor({
             position: this.position,
diff --git a/app/script/infinitySurfaceCharge.ts b/app/script/infinitySurfaceCharge.ts
index ad38be4..4ec5d70 100644
--- a/app/script/infinitySurfaceCharge.ts
+++ b/app/script/infinitySurfaceCharge.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { Charge, ChargeToChargeType } from './charge';
+import { Charge, ChargeType, ChargeToChargeType } from './charge';
 import { permittivity } from './constants';
 import { Editor, PositionEditor, NumberEditor, RotationEditor } from './editor';
 import { Store } from './store';
@@ -38,7 +38,7 @@ export class InfinitySurfaceCharge extends Charge {
      * 電荷の正負を取得する
      * @returns 電荷の正負
      */
-    override getChargeType = () => {
+    override getChargeType = (): ChargeType => {
 
         return ChargeToChargeType(this.surfaceDensity);
 
@@ -50,7 +50,7 @@ export class InfinitySurfaceCharge extends Charge {
      * @param position 任意の座標
      * @returns 電荷との距離ベクトル
      */
-    private distanceFrom = (position: THREE.Vector3) => {
+    private distanceFrom = (position: THREE.Vector3): THREE.Vector3 => {
 
         // 計算を行いやすいよう、面電荷がz=0に位置するように観測点の座標を変換する
         const positionTransformed = position.clone().sub(this.position);         // 面電荷の中心を原点に移動
@@ -69,7 +69,7 @@ export class InfinitySurfaceCharge extends Charge {
      * @param threshold 閾値
      * @returns 接触しているかどうか
      */
-    override isContact = (position: THREE.Vector3, threshold: number) => {
+    override isContact = (position: THREE.Vector3, threshold: number): boolean => {
 
         return this.distanceFrom(position).lengthSq() < threshold ** 2;
 
@@ -81,7 +81,7 @@ export class InfinitySurfaceCharge extends Charge {
      * @param position 任意の座標
      * @returns 電界ベクトル
      */
-    override electricFieldVector = (position: THREE.Vector3) => {
+    override electricFieldVector = (position: THREE.Vector3): THREE.Vector3 => {
 
         const distance = this.distanceFrom(position);
 
@@ -98,7 +98,7 @@ export class InfinitySurfaceCharge extends Charge {
      * 電気力線の始点、方向ベクトルの配列を返す
      * @returns 電気力線の始点、方向ベクトルの配列
      */
-    override electricForceLinesDirection = () => {
+    override electricForceLinesDirection = (): { begin: THREE.Vector3, direction: THREE.Vector3 }[] => {
 
         const widthCount = 6;
         const heightCount = 6;
@@ -143,7 +143,7 @@ export class InfinitySurfaceCharge extends Charge {
     /**
      * JSONから電荷を生成する
      */
-    static override fromJSON = (json: any) => {
+    static override fromJSON = (json: any): Charge => {
         
         return new InfinitySurfaceCharge(
             new THREE.Vector3(json.position.x, json.position.y, json.position.z),
@@ -179,7 +179,7 @@ export class InfinitySurfaceCharge extends Charge {
     /**
      * パラメーター設定用エディタを生成する
      */
-    override createEditor = () => {
+    override createEditor = (): Editor => {
 
         const positionEditor = new PositionEditor({
             position: this.position,
diff --git a/app/script/pointCharge.ts b/app/script/pointCharge.ts
index 67730ab..ac3493c 100644
--- a/app/script/pointCharge.ts
+++ b/app/script/pointCharge.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { Charge, ChargeToChargeType } from './charge';
+import { Charge, ChargeType, ChargeToChargeType } from './charge';
 import { kCoulomb } from './constants';
 import { GSS } from './gss';
 import { Editor, PositionEditor, NumberEditor } from './editor';
@@ -38,7 +38,7 @@ export class PointCharge extends Charge {
      * 電荷の正負を取得する
      * @returns 電荷の正負
      */
-    override getChargeType = () => {
+    override getChargeType = (): ChargeType => {
 
         return ChargeToChargeType(this.charge);
 
@@ -50,7 +50,7 @@ export class PointCharge extends Charge {
      * @param position 任意の座標
      * @returns 電荷との距離ベクトル
      */
-    private distanceFrom = (position: THREE.Vector3) => {
+    private distanceFrom = (position: THREE.Vector3): THREE.Vector3 => {
 
         return position.clone().sub(this.position);
 
@@ -63,7 +63,7 @@ export class PointCharge extends Charge {
      * @param threshold 閾値
      * @returns 接触しているかどうか
      */
-    override isContact = (position: THREE.Vector3, threshold: number) => {
+    override isContact = (position: THREE.Vector3, threshold: number): boolean => {
 
         return this.position.distanceToSquared(position) < threshold ** 2;
 
@@ -75,7 +75,7 @@ export class PointCharge extends Charge {
      * @param position 任意の座標
      * @returns 電界ベクトル
      */
-    override electricFieldVector = (position: THREE.Vector3) => {
+    override electricFieldVector = (position: THREE.Vector3): THREE.Vector3 => {
 
         const diffVector = this.distanceFrom(position);
 
@@ -93,7 +93,7 @@ export class PointCharge extends Charge {
      * 電気力線の始点、方向ベクトルの配列を返す
      * @returns 電気力線の始点、方向ベクトルの配列
      */
-    override electricForceLinesDirection = () => {
+    override electricForceLinesDirection = (): { begin: THREE.Vector3, direction: THREE.Vector3 }[] => {
 
         return GSS(25).map((vector) => { return { begin: this.position, direction: vector } });
 
@@ -119,7 +119,7 @@ export class PointCharge extends Charge {
     /**
      * JSONから電荷を生成する
      */
-    static override fromJSON = (json: any) => {
+    static override fromJSON = (json: any): Charge => {
 
         return new PointCharge(
             new THREE.Vector3(json.position.x, json.position.y, json.position.z),
@@ -132,7 +132,7 @@ export class PointCharge extends Charge {
     /**
      * 電荷をJSONに変換する
      */
-    override toJSON = () => {
+    override toJSON = (): any => {
 
         return {
             position: {
@@ -149,7 +149,7 @@ export class PointCharge extends Charge {
     /**
      * パラメーター設定用エディタを生成する
      */
-    override createEditor = () => {
+    override createEditor = (): Editor => {
 
         const positionEditor = new PositionEditor({
             position: this.position,
diff --git a/app/script/sphereSurfaceCharge.ts b/app/script/sphereSurfaceCharge.ts
index bfef86c..00a4bc4 100644
--- a/app/script/sphereSurfaceCharge.ts
+++ b/app/script/sphereSurfaceCharge.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { Charge, ChargeToChargeType } from './charge';
+import { Charge, ChargeType, ChargeToChargeType } from './charge';
 import { permittivity } from './constants';
 import { GSS } from './gss';
 import { Editor, PositionEditor, NumberEditor } from './editor';
@@ -40,7 +40,7 @@ export class SphereSurfaceCharge extends Charge {
      * 電荷の正負を取得する
      * @returns 電荷の正負
      */
-    override getChargeType = () => {
+    override getChargeType = (): ChargeType => {
 
         return ChargeToChargeType(this.arealDensity);
 
@@ -52,7 +52,7 @@ export class SphereSurfaceCharge extends Charge {
      * @param position 任意の座標
      * @returns 電荷との距離ベクトル
      */
-    private distanceFrom = (position: THREE.Vector3) => {
+    private distanceFrom = (position: THREE.Vector3): THREE.Vector3 => {
 
         return position.clone().sub(this.position);
 
@@ -65,7 +65,7 @@ export class SphereSurfaceCharge extends Charge {
      * @param threshold 閾値
      * @returns 接触しているかどうか
      */
-    override isContact = (position: THREE.Vector3, threshold: number) => {
+    override isContact = (position: THREE.Vector3, threshold: number): boolean => {
 
         return position.distanceToSquared(this.position) < (this.radius + threshold) ** 2;
 
@@ -77,7 +77,7 @@ export class SphereSurfaceCharge extends Charge {
      * @param position 任意の座標
      * @returns 電界ベクトル
      */
-    override electricFieldVector = (position: THREE.Vector3) => {
+    override electricFieldVector = (position: THREE.Vector3): THREE.Vector3 => {
 
         const diffVector = this.distanceFrom(position);
         const diffLengthSq = diffVector.lengthSq();
@@ -104,7 +104,7 @@ export class SphereSurfaceCharge extends Charge {
      * 電気力線の始点、方向ベクトルの配列を返す
      * @returns 電気力線の始点、方向ベクトルの配列
      */
-    override electricForceLinesDirection = () => {
+    override electricForceLinesDirection = (): { begin: THREE.Vector3, direction: THREE.Vector3 }[] => {
 
         return GSS(25).map((vector) => {
             return {
@@ -130,7 +130,7 @@ export class SphereSurfaceCharge extends Charge {
     /**
      * JSONから電荷を生成する
      */
-    static override fromJSON = (json: any) => {
+    static override fromJSON = (json: any): Charge => {
 
         return new SphereSurfaceCharge(
             new THREE.Vector3(json.position.x, json.position.y, json.position.z),
@@ -162,7 +162,7 @@ export class SphereSurfaceCharge extends Charge {
     /**
      * パラメーター設定用エディタを生成する
      */
-    override createEditor = () => {
+    override createEditor = (): Editor => {
 
         const positionEditor = new PositionEditor({
             position: this.position,
diff --git a/app/script/sphereVolumeCharge.ts b/app/script/sphereVolumeCharge.ts
index 422f8a7..69cbed6 100644
--- a/app/script/sphereVolumeCharge.ts
+++ b/app/script/sphereVolumeCharge.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { Charge, ChargeToChargeType } from './charge';
+import { Charge, ChargeType, ChargeToChargeType } from './charge';
 import { permittivity } from './constants';
 import { GSS } from './gss';
 import { Editor, PositionEditor, NumberEditor } from './editor';
@@ -40,7 +40,7 @@ export class SphereVolumeCharge extends Charge {
      * 電荷の正負を取得する
      * @returns 電荷の正負
      */
-    override getChargeType = () => {
+    override getChargeType = (): ChargeType => {
 
         return ChargeToChargeType(this.volumeDensity);
 
@@ -52,7 +52,7 @@ export class SphereVolumeCharge extends Charge {
      * @param position 任意の座標
      * @returns 電荷との距離ベクトル
      */
-    private distanceFrom = (position: THREE.Vector3) => {
+    private distanceFrom = (position: THREE.Vector3): THREE.Vector3 => {
 
         return position.clone().sub(this.position);
 
@@ -65,7 +65,7 @@ export class SphereVolumeCharge extends Charge {
      * @param threshold 閾値
      * @returns 接触しているかどうか
      */
-    override isContact = (position: THREE.Vector3, threshold: number) => {
+    override isContact = (position: THREE.Vector3, threshold: number): boolean => {
 
         return position.distanceToSquared(this.position) < (this.radius + threshold) ** 2;
 
@@ -77,7 +77,7 @@ export class SphereVolumeCharge extends Charge {
      * @param position 任意の座標
      * @returns 電界ベクトル
      */
-    override electricFieldVector = (position: THREE.Vector3) => {
+    override electricFieldVector = (position: THREE.Vector3): THREE.Vector3 => {
 
         const diffVector = this.distanceFrom(position);
         const diffLength = diffVector.length();
@@ -102,7 +102,7 @@ export class SphereVolumeCharge extends Charge {
      * 電気力線の始点、方向ベクトルの配列を返す
      * @returns 電気力線の始点、方向ベクトルの配列
      */
-    override electricForceLinesDirection = () => {
+    override electricForceLinesDirection = (): { begin: THREE.Vector3, direction: THREE.Vector3 }[] => {
 
         return GSS(25).map((vector) => {
             return {
@@ -128,7 +128,7 @@ export class SphereVolumeCharge extends Charge {
     /**
      * JSONから電荷を生成する
      */
-    static override fromJSON = (json: any) => {
+    static override fromJSON = (json: any): Charge => {
 
         return new SphereVolumeCharge(
             new THREE.Vector3(json.position.x, json.position.y, json.position.z),
@@ -160,7 +160,7 @@ export class SphereVolumeCharge extends Charge {
     /**
      * パラメーター設定用エディタを生成する
      */
-    override createEditor = () => {
+    override createEditor = (): Editor => {
 
         const positionEditor = new PositionEditor({
             position: this.position,