Address pentest timing and cleanup findings

Address pentest timing and cleanup findings #150