Fixed all alignment, checked that files compile