actually cleaned up compiler shit a little bit