Code Clean :)