Cleaned up code/documentation