code revamp :)