Cleaned up a few methods