Code Cleanup

Also made stars a bit better.