Cleaned up functions
Updates