some formatting, remove unnecessary variables