Minor changes
Major refactor