Cleaned up some code for hints.