analog: Cleanup of code style