Cleaned up functions
Cleaned up functions