Style Improvements :)