Comment
Better coding style
Clean up AlphaType