Cleaned up the methods a bit