Clean up code a bit
Fix screenshot update not creating dir bug