Removed unnecessary parameters, cleaned up a bit