minor code changes and styling