Cleaned up the code a little bit and also worked on the electricity API for a bit.