Added more procedures; Cleaned-up code