Cleanup project

Let's do the alignment thingy then. I'll update