diff --git a/bus.h b/bus.h
index 25c515f..f9a4454 100644
--- a/bus.h
+++ b/bus.h
@@ -111,24 +111,18 @@ public:
 	rl02   *getRL02()   { return rl02_;   }
 	tm_11  *getTM11()   { return tm11;    }
 
-	uint16_t read    (const uint16_t a, const word_mode_t word_mode, const rm_selection_t mode_selection, const bool peek_only=false, const d_i_space_t s = i_space);
+	uint16_t read(const uint16_t a, const word_mode_t word_mode, const rm_selection_t mode_selection, const bool peek_only=false, const d_i_space_t s = i_space);
 	uint16_t read_byte(const uint16_t a) { return read(a, wm_byte, rm_cur); }
 	uint16_t read_word(const uint16_t a, const d_i_space_t s = i_space);
 	uint16_t peekWord(const uint16_t a);
-
 	uint8_t  readUnibusByte(const uint32_t a);
-	void     writeUnibusByte(const uint32_t a, const uint8_t value);
-
-	write_rc_t write    (const uint16_t a, const word_mode_t word_mode, uint16_t value, const rm_selection_t mode_selection, const d_i_space_t s = i_space);
-	void       write_byte(const uint16_t a, const uint8_t value) { write(a, wm_byte, value, rm_cur); }
-	void       write_word(const uint16_t a, const uint16_t value, const d_i_space_t s = i_space);
-
 	uint16_t readPhysical(const uint32_t a);
+
+	write_rc_t write(const uint16_t a, const word_mode_t word_mode, uint16_t value, const rm_selection_t mode_selection, const d_i_space_t s = i_space);
+	void     writeUnibusByte(const uint32_t a, const uint8_t value);
+	void     write_byte(const uint16_t a, const uint8_t value) { write(a, wm_byte, value, rm_cur); }
+	void     write_word(const uint16_t a, const uint16_t value, const d_i_space_t s = i_space);
 	void     writePhysical(const uint32_t a, const uint16_t value);
 
-	void     check_odd_addressing(const uint16_t a, const int run_mode, const d_i_space_t space, const bool is_write);
-
 	bool     is_psw(const uint16_t addr, const int run_mode, const d_i_space_t space) const;
-
-	void check_address(const bool trap_on_failure, const bool is_write, const memory_addresses_t & addr, const word_mode_t word_mode, const bool is_data, const int run_mode);
 };