Cleaned up Clock plugin