comments + cleanup
Code-edits og compartmentalizing