Little Code Cleanup

Some features recoded and added some nice tweaks