Updated comments, little refactor & cleanup