General cleanup. Awaiting Feedback.