Cleanup + Bug fix

Thanks to @shawshark <3