Cleaned up variables and returns.