Cleaned code. Added Headers