still refactering and cleaning like a house maid :)