Started using newlines in comments
Trimmed some fat from the code and added constants. Put reload logic in a more sensible place