Cleaned up code and onto handle piece successfully