Removing excess stuffs
Lil bit O' custimization