Cleaned up the code a little (removed some unneeded commenting, indentation, etc.)