Fixed alignment and bit of cleanup