Code cleanup & Documentation - round one