Refactored lot of things