Optimized/Cleaned up some things