Moved back into one class + minor cleaning