Minor fixes for styling and Constants