Cleaned up initial version