Make the code look a little better