[#29] Removed several stupid comments and do some little refactoring