* cleaned up some code formatting and fixed compiler warning on gcc