Improved methods
Cleaned up code