Implement suggestions by Raydiation