Cleaned up code, better drafting