Cleanup code
Don't align fields