Add feature for annoying @xlexi
Style fixes