Cleaned up, added aliases