Cleanup, added more variables