Cleaned up some methods